Only set using_themed_icon if we actually got an icon list from the theme.

2004-10-04  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkwindow.c (gtk_window_realize_icon): Only set
	using_themed_icon if we actually got an icon list from the
	theme.  (#154472, Morten Welinder)

diff --git a/ChangeLog b/ChangeLog
index 2bc45dcdf66e8d52707dae6ca8120ae2e2f39fc9..6be20206a935a058b678d41c7d3249d6d9bbda6c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
        * gtk/gtkwindow.c (gtk_window_set_icon_list): 
        (gtk_window_set_default_icon_list): Ref the new icons
        before unreffing the old ones.  (#154468, Morten Welinder)
+       (gtk_window_realize_icon): Only set using_themed_icon if
+       we actually got an icon list from the theme.  (#154472, Morten
+       Welinder)
 
 2004-10-03  Matthias Clasen  <mclasen@redhat.com>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2bc45dcdf66e8d52707dae6ca8120ae2e2f39fc9..6be20206a935a058b678d41c7d3249d6d9bbda6c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -3,6 +3,9 @@
        * gtk/gtkwindow.c (gtk_window_set_icon_list): 
        (gtk_window_set_default_icon_list): Ref the new icons
        before unreffing the old ones.  (#154468, Morten Welinder)
+       (gtk_window_realize_icon): Only set using_themed_icon if
+       we actually got an icon list from the theme.  (#154472, Morten
+       Welinder)
 
 2004-10-03  Matthias Clasen  <mclasen@redhat.com>
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2bc45dcdf66e8d52707dae6ca8120ae2e2f39fc9..6be20206a935a058b678d41c7d3249d6d9bbda6c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -3,6 +3,9 @@
        * gtk/gtkwindow.c (gtk_window_set_icon_list): 
        (gtk_window_set_default_icon_list): Ref the new icons
        before unreffing the old ones.  (#154468, Morten Welinder)
+       (gtk_window_realize_icon): Only set using_themed_icon if
+       we actually got an icon list from the theme.  (#154472, Morten
+       Welinder)
 
 2004-10-03  Matthias Clasen  <mclasen@redhat.com>
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2bc45dcdf66e8d52707dae6ca8120ae2e2f39fc9..6be20206a935a058b678d41c7d3249d6d9bbda6c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -3,6 +3,9 @@
        * gtk/gtkwindow.c (gtk_window_set_icon_list): 
        (gtk_window_set_default_icon_list): Ref the new icons
        before unreffing the old ones.  (#154468, Morten Welinder)
+       (gtk_window_realize_icon): Only set using_themed_icon if
+       we actually got an icon list from the theme.  (#154472, Morten
+       Welinder)
 
 2004-10-03  Matthias Clasen  <mclasen@redhat.com>
 

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index b61efceb9de171f940c39f177ba7af1ab5415b74..41c64cb5b0aa46946af7768e43b88379138b2446 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -2713,7 +2713,8 @@ gtk_window_realize_icon (GtkWindow *window)
   if (icon_list == NULL && info->icon_name) 
     {
       icon_list = icon_list_from_theme (widget, info->icon_name);
-      info->using_themed_icon = TRUE;  
+      if (icon_list)
+       info->using_themed_icon = TRUE;
     }
 
   /* Inherit from transient parent */